fix: merge.ff is ignored
#1501
Merged
fix: merge.ff is ignored
#1501
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
After changing the priority of the preferences/configurations for the merge mode in sourcegit-scm#1495, the git configuration `merge.ff` was ignored. The reason is, that `GetSettingsPreferredMergeMode()` does not return `null` in the default case. This is now fixed.
love-linger
added a commit
that referenced
this pull request
Jul 3, 2025
- returns `null` to fallback to git's `merge.ff` configure when user does not configure `Preferred Merge Mode` - since `GetGitConfigBranchMergeOptions` is the last one, returns `Default` as fallback Signed-off-by: leo <[email protected]>
|
Argh, my bugfix was buggy itself. I should have tested it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After changing the priority of the preferences/configurations for the merge mode in #1495, the git configuration
merge.ffwas ignored. The reason is, thatGetSettingsPreferredMergeMode()does not returnnullin the default case. This is now fixed.